Skip to content

Rebase - #8

Closed
lm-sousa wants to merge 6 commits into
mainfrom
multi-weaver
Closed

Rebase#8
lm-sousa wants to merge 6 commits into
mainfrom
multi-weaver

Conversation

@lm-sousa

@lm-sousa lm-sousa commented Jan 18, 2026

Copy link
Copy Markdown
Member

No description provided.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request refactors the FortranWeaver to support multiple weaver instances by explicitly passing the weaver instance through join point constructors, rather than relying on thread-local static access. Additionally, it updates JavaScript dependencies, improves GitHub Actions workflow branch resolution logic, and adds a new Copilot setup workflow.

Changes:

  • Refactored Java joinpoint constructors to accept FortranWeaver parameter and removed static thread-local weaver access
  • Updated JavaScript package dependencies to newer versions
  • Improved GitHub Actions workflows with better branch resolution logic and added Copilot setup steps
  • Fixed ESLint configuration structure by moving tsconfigRootDir to correct location

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
GenericFortranJoinpoint.java Updated constructor to accept FortranWeaver parameter
FProgram.java Updated constructor to accept FortranWeaver parameter
AFortranWeaverJoinPoint.java Added constructor accepting FortranWeaver and getWeaverEngine method override
FortranWeaver.java Removed static getFortranWeaver method and updated getRootJp to pass weaver instance
FortranJoinpoints.java Changed factory from FunctionClassMap to BiFunctionClassMap to support weaver parameter
package.json Updated devDependencies to newer versions and bumped package version to 0.1.0
eslint.config.js Moved tsconfigRootDir to parserOptions and added __dirname definition
nightly.yml Improved branch resolution with priority-based logic and removed unused environment variables
copilot-setup-steps.yml New workflow file for Copilot integration with similar branch resolution logic

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .github/workflows/copilot-setup-steps.yml Outdated
Comment thread .github/workflows/copilot-setup-steps.yml Dismissed
Main's rebased code still used the removed static weaver accessors and
1-arg FortranJoinpoints.create. Thread the FortranWeaver instance
through instead of restoring static/THREAD_LOCAL access:

- FortranWeaver: make getFactory()/getContext() instance methods
  (getContext() referenced the removed getFortranWeaver() static)
- AstFactory: take FortranWeaver as first parameter (same shape as the
  lara-4 branch), call weaver.getFactory() and 3-arg
  FortranJoinpoints.create(node, weaver, targetClass)
- AFortranWeaverJoinPoint: thread getWeaverEngine() into the remaining
  main-era create() call sites and replace ::create method refs with
  weaver-capturing lambdas
- joinpoints/F*: all concrete joinpoints from main now take
  (node, FortranWeaver) constructors with super(weaver) (or
  super(new FWrapper(node, weaver), weaver)); child-collection methods
  thread getWeaverEngine() into create()

Also pin GitHub Actions to full commit SHAs in copilot-setup-steps.yml
(Sonar S7637).

Verified with: gradle -p FortranWeaver compileJava (BUILD SUCCESSFUL,
JDK 17, lara-framework/specs-java-libs multi-weaver/master checkouts)
@sonarqubecloud

sonarqubecloud Bot commented Sep 7, 2026

Copy link
Copy Markdown

@lm-sousa lm-sousa mentioned this pull request Sep 7, 2026
@lm-sousa lm-sousa changed the title Multi weaver Rebase Sep 7, 2026
@lm-sousa
lm-sousa changed the base branch from staging to main September 7, 2026 19:08
@lm-sousa

lm-sousa commented Sep 7, 2026

Copy link
Copy Markdown
Member Author

Note

omen-alpha responding on behalf of @lm-sousa

Closing as superseded by #65, which tracks the same multi-weaver branch against main (the rebase it contains is described there).

@lm-sousa lm-sousa closed this Sep 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants